Merge from trunk.

author Paul Eggert <eggert@cs.ucla.edu>

Mon, 16 Apr 2012 06:40:21 +0000 (23:40 -0700)

committer Paul Eggert <eggert@cs.ucla.edu>

Mon, 16 Apr 2012 06:40:21 +0000 (23:40 -0700)
author Paul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 06:40:21 +0000 (23:40 -0700)
committer Paul Eggert <eggert@cs.ucla.edu>
Mon, 16 Apr 2012 06:40:21 +0000 (23:40 -0700)
diff --cc etc/NEWS
Simple merge
diff --cc src/ChangeLog
Simple merge
author	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 16 Apr 2012 06:40:21 +0000 (23:40 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 16 Apr 2012 06:40:21 +0000 (23:40 -0700)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history